bitkeeper revision 1.1389.1.50 (4283754dTJV8OKiH7gTm6FnKuQ2bVQ)

Fix the Xen build.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index add8f51d43b631df0b78b5188149959c171addcd..df92bea13317365747c283c958278f5cbd2cea50 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -230,15 +230,15 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
             break;
         }
         
-        if ( (op->u.pincpudomain.exec_domain >= MAX_VIRT_CPUS) ||
-             !d->exec_domain[op->u.pincpudomain.exec_domain] )
+        if ( (op->u.pincpudomain.vcpu >= MAX_VIRT_CPUS) ||
+             !d->exec_domain[op->u.pincpudomain.vcpu] )
         {
             ret = -EINVAL;
             put_domain(d);
             break;
         }
 
-        ed = d->exec_domain[op->u.pincpudomain.exec_domain];
+        ed = d->exec_domain[op->u.pincpudomain.vcpu];
         if ( ed == NULL )
         {
             ret = -ESRCH;
@@ -382,14 +382,14 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
             break;
         }
 
-        if ( op->u.getvcpucontext.exec_domain >= MAX_VIRT_CPUS )
+        if ( op->u.getvcpucontext.vcpu >= MAX_VIRT_CPUS )
         {
             ret = -EINVAL;
             put_domain(d);
             break;
         }
         
-        ed = d->exec_domain[op->u.getvcpucontext.exec_domain];
+        ed = d->exec_domain[op->u.getvcpucontext.vcpu];
         if ( ed == NULL )
         {
             ret = -ESRCH;

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 37294894921be5dbae15108376325f203e1180a5..db331a5e1479608c12b25d32bfa66d789f25e317 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -221,7 +221,7 @@ int set_info_guest(struct domain *d, dom0_setdomaininfo_t *setdomaininfo)
 {
     int rc = 0;
     struct vcpu_guest_context *c = NULL;
-    unsigned long vcpu = setdomaininfo->exec_domain;
+    unsigned long vcpu = setdomaininfo->vcpu;
     struct exec_domain *ed; 
 
     if ( (vcpu >= MAX_VIRT_CPUS) || ((ed = d->exec_domain[vcpu]) == NULL) )